Attempt to fix stuff