Fixes #1257