(360) Fix solution