partial fix for client strategy