fixing decorator methods order