fixes #2424