Fixes #1243