added extra check because the careless