COMPLETELY FIXED... I think