Fixes taking client as location
Fixes client