Fix keystone bug