fixing a mess