Fixes #1345