Resolve stale issue