fixed crash but weird bug now