Awful bug fixed