FIXED FOR SURE THIS TIME