Fix solution in one step
Final solution implementation