fixes #571
Merge commit 'd5555169203bc5ce58800061de144f353e89478d'