Fixed issue 6468