Should resolve #289 (please test and give feedback)