Fixed for keystone needs