This issue is fixed, we introduced an orPresent = true attribute to the @Past and @Future annotations.