Actually fix issues with getting fields