Trying to fix allocation still