Fixes #2271