Still trying to fix weird rotation issue