Fixes #1770

Fixes #1770