Trying to fix the thing