This should (finally) fix #50