Fixes #1954