Fixes #645