Fixes #604