Fixes #603