Fixed bug using keystone