Fixed the solution issues