Date variable fix