Fixes #1191