Corrected solution issues