Fix of bug