fix all 6