Fixed changes on listing 7.30