A fix for #206

@tgriesser Sorry, I can't figure out how to get rid of Ben's two commits... But this should fix the issue mentioned in #206. Maybe you can just pick it out of here, if merging isn't possible.