FIXING FOR LAST TIME