fixed ticket 7210