Fixes #1284