FIX: Add stop