FIxed minor bug crash