Fix in case of undefined data