fixes #1603