Fixes #1348