Fixes #1328