fixes #2441