Swap decorator order; fixes #95