Trying to fix at this point