solve incorrect return