Fixed keep issue