FIX: Fix decorator