Fix issue with early return.