Fixes #1360