FIX: Fixing sample data path logic