fixes #1630