fixes #1456