Fixes #1646
Fixes #1655