diff --git a/sms/sms.go b/sms/sms.go
index b12bb07..cf21d4e 100644
--- a/sms/sms.go
+++ b/sms/sms.go
@@ -272,7 +272,7 @@ func (s *Message) decodeSubmit(data []byte) (n int, err error) {
 	}
 	s.RejectDuplicates = sms.RejectDuplicates
 
-	switch s.VPFormat {
+	switch ValidityPeriodFormat(sms.ValidityPeriodFormat) {
 	case ValidityPeriodFormats.Absolute, ValidityPeriodFormats.Enhanced:
 		return n, ErrNonRelative
 	default:
diff --git a/sms/sms_test.go b/sms/sms_test.go
index 40a8cbf..9430a29 100644
--- a/sms/sms_test.go
+++ b/sms/sms_test.go
@@ -22,6 +22,8 @@ var (
 
 	pduDeliverGsm7   = "07919762020033F1040B919762995696F0000041606291401561066379180E8200"
 	pduSubmitGsm7    = "07919762020033F111000B919762995696F00000AA066379180E8200"
+	pduSubmitGsm7_EnhancedTpVp = "05915155010009010891515511110000420300000000001e547" +
+		"47a0e9a36a72074780e9a81e6e5f1db4d9e83e86f103b6d2f03"
 	pduDeliverGsm7_2 = "0791551010010201040D91551699296568F80011719022124215293DD4B71C5E26BF" +
 		"41D3E6145476D3E5E573BD0C82BF40B59A2D96CBE564351BCE8603A164319D8CA6ABD540E432482673C172AED82DE502"
 
@@ -71,6 +73,13 @@ var (
 		VP:                   ValidityPeriod(time.Hour * 24 * 4),
 		VPFormat:             ValidityPeriodFormats.Relative,
 	}
+	smsSubmitGsm7_EnhancedTpVp = Message{
+		Text:                 "This SMS has 3 seconds to live",
+		Encoding:             Encodings.Gsm7Bit,
+		Type:                 MessageTypes.Submit,
+		Address:              "+15551111",
+		ServiceCenterAddress: "+15551000",
+	}
 	smsReport = Message{
 		Type:                 MessageTypes.StatusReport,
 		Status:               0x00, // received
@@ -176,6 +185,16 @@ func TestSmsSubmitReadFromGsm7(t *testing.T) {
 	assert.Equal(t, smsSubmitGsm7, msg)
 }
 
+func TestSmsSubmitReadFromGsm7_EnhancedTpVp(t *testing.T) {
+	t.Parallel()
+
+	var msg Message
+	data, err := util.Bytes(pduSubmitGsm7_EnhancedTpVp)
+	require.NoError(t, err)
+	_, err = msg.ReadFrom(data)
+	assert.Equal(t, err, ErrNonRelative)
+}
+
 func TestSmsSubmitPduUCS2(t *testing.T) {
 	t.Parallel()