Fix for solution 06/06
Add solution for 06/07