Fixes #2222