fixes #1644