Fixed return to main