Final fix for keystone