Fixed so it now works again.. Until Listing 5.4