fixissue for 6021