fixes #2311