fix all phase 2