Fixes #1353