FIX: Take into account diset decorator