Fix issues #452 and #489
@ -1 +1 @@
Subproject commit 5497c6fec44de6767a6488f540526d70218ef0da
Subproject commit 17a12618074ccb1e2e66df566c55c621dd8503a7
Subproject commit 45cf0cbf77c87eb591914f0235b3b2e36ef09bb8
Subproject commit 5fc960d6f374fd316f45ab7498add563d6db2127