Fixes #1256