More fixe, prevent bug