Fixed load/save decorator order.