Removed debug, added a new workaround for the "Already Decorating" error