WayView GetFields fix