Client code fix - Chapter 11