FIX: Take into account diset decorator
Merge pull request #1587 from acasajus/new-dis

[v7r0]FIX: Take into account diset decorator