fixes #1355