Fixes #1915