Fixed bug with return.