FIX: Fix taps use