Fix for regression w/function return.