Client/Create fix