[FIX] refactored tupler