Fixes #1337