fixes #1546