Merge in fix for return.