Fixes #1918