Fixed bug with return