*Really* fix #213 this time (I hope)