Added a solution for 1.6