Fixes #1235