Fix of bad bug