Fixed issue with Chapter 02 and 04