diff --git a/apier/tpactions.go b/apier/tpactions.go
index 6f365704d..099bd6ea0 100644
--- a/apier/tpactions.go
+++ b/apier/tpactions.go
@@ -21,9 +21,8 @@ package apier
 import (
 	"errors"
 	"fmt"
-	"time"
-	"github.com/cgrates/cgrates/utils"
 	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
 )
 
 // Creates a new Actions profile within a tariff plan
@@ -48,16 +47,16 @@ func (self *Apier) SetTPActions(attrs utils.TPActions, reply *string) error {
 	acts := make([]*engine.Action, len(attrs.Actions))
 	for idx, act := range attrs.Actions {
 		acts[idx] = &engine.Action{
-			ActionType:		act.Identifier,
-			BalanceId: 	act.BalanceType,
-			Direction:       act.Direction,
-			Units:          act.Units,
-			ExpirationDate: time.Unix(act.ExpiryTime,0),
-			DestinationTag: act.DestinationId,
-			RateType:      act.RateType,
-			RateValue:     act.Rate,
-			MinutesWeight: act.MinutesWeight,
-			Weight:        act.Weight,
+			ActionType:       act.Identifier,
+			BalanceId:        act.BalanceType,
+			Direction:        act.Direction,
+			Units:            act.Units,
+			ExpirationString: act.ExpiryTime,
+			DestinationTag:   act.DestinationId,
+			RateType:         act.RateType,
+			RateValue:        act.Rate,
+			MinutesWeight:    act.MinutesWeight,
+			Weight:           act.Weight,
 		}
 	}
 	if err := self.StorDb.SetTPActions(attrs.TPid, map[string][]*engine.Action{attrs.ActionsId: acts}); err != nil {
diff --git a/engine/loader_csv.go b/engine/loader_csv.go
index c452eed52..51e5d1c89 100644
--- a/engine/loader_csv.go
+++ b/engine/loader_csv.go
@@ -403,7 +403,7 @@ func (csvr *CSVReader) LoadActions() (err error) {
 func (csvr *CSVReader) LoadActionTimings() (err error) {
 	csvReader, fp, err := csvr.readerFunc(csvr.actiontimingsFn, csvr.sep, utils.ACTION_TIMINGS_NRCOLS)
 	if err != nil {
-		log.Print("Could not load action triggers file: ", err)
+		log.Print("Could not load action timings file: ", err)
 		// allow writing of the other values
 		return nil
 	}
diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go
index 97c27463b..9dc35ec7f 100644
--- a/engine/loader_csv_test.go
+++ b/engine/loader_csv_test.go
@@ -85,7 +85,7 @@ vdf,0,*out,inf,2012-02-28T00:00:00Z,STANDARD,inf
 vdf,0,*out,fall,2012-02-28T00:00:00Z,PREMIUM,rif
 `
 	actions = `
-MINI,TOPUP,MINUTES,*out,100,2013-07-19T13:03:22Z,NAT,*absolute,0,10,10
+MINI,TOPUP,MINUTES,*out,100,*unlimited,NAT,*absolute,0,10,10
 `
 	actionTimings = `
 MORE_MINUTES,MINI,ONE_TIME_RUN,10