Trying to fix a mess