Fixes #1190