Should resolve #256 (please test, works for me)