Fixes #1804
Fixes #1803