Decorate fix included. Now let's see if I can rewrite it in ACS to where I don't need the decorate fix.