fixes #603