Attempted fix with Result data propagation