Fixes #1198