[fix] Fixing expiration issue