Trying to fix stuff