Extra check added