Fixes #2221