Fixed an issue where we weren't creating the return fields.