Fixes client interface