fix all (inchallah)