[v7r0]FIX: Take into account diset decorator