Fixes #1172