fixes #1667