Fixes field retrieval