Trying to fix struct