finish fix first turn bug