(DO NOT MERGE!!!) DSA-56, fix class decorator