Hack in keystone 2