Fix test failure. Fixes #619
Merge commit '8321514a023859c69a9ce8c032a16caee9d6c6d6'