Fixes #1177