Fix bugs from lesson 13