Added temporary fix for #749 (Final fix will come with 1.1.0-rc3)