Add a solution for #2