fixes #426 - Strange behaviour