Fixed  bug