Fixes #1374