Bug fix: Expiration check error