Fixed a bug where since and until didn't always exist