fixes #2474