Taking better care of constraining value to reference day