Fix for solution 05/03
Add solution for 05/04