fix jojo's bug