fixes #2632