Fixes #653