Validity time return fix