Fixed bug of no return