fixes #2290