temp workaround of keystone client issue