Fixes client code