[Small Issue] prevent bug