Fixes client