fixing race on expiry (master)