Fix solution for 05/02