Stop the decorator madness. Also fixes a bug.