Fixes #745