fixes #1643