fixes #2203