Fix: expiry not handled correctly