Add solution for 1.7