fixes #2131