Chapter 305 should be changed