fixes #2129