Fixes #1270