Fixes #1850