Fixes #1333