Fixes #2192