Fix solution for new problem