Fixes #1186