Fixes on solution 9.