Trying to fix allocation