Solution for 1.17