Date check functionality fix

Date check functionality fix