Fixing Keystone class