Merge v0dro's #98, hopefully fixing #70