Fixed on some crashs