fixes #2221