[reimertz]

I accidentally pushed a what I thought to be a fix that turned out to break everything in v0.6.4. everything is fine now in v0.6.5.

Sorry about that.