fixes #1656
fixes #1735