Fix bugs since remove of return.