Fixed more gaps in the return value.