fixes #2401