Issue452

I fixed kozdincer's earlier patch, I hope (we'll see from travisCI).