Michiel Koning

@stephsharp I've downloaded the develop sources and tried to reproduce the error. As far as I can tell, your changes have fixed the issue. Thanks!