Hotfix - client syntax