Fixed multiple  bug