Wrapped FieldVal in a closure and fixed multiple async-related issues