cleaned issue 7745