Fixes #1350