Fix problem caused by not requiring date