Fixes #1667
Fixes #1667