fixes #5279