solved 1.17, 1.18; correct error in 1.16