final fix good to go, pain in the ass