30% ruling year calculation

Hi All,

I have got 30% ruling benefit for 5 months in the year 2013. After that i moved into my native country. I came again Netherlands in 2016 and applied for 30% ruling. I got that benefit from 1 Feb 2016 till 31-7-2023 (as per 30% ruling approval letter). Now they are going to change to 5 years from 1st Jan 2019.
My understanding that i will get that benefit till 31-7-2020.

Is that correct? Or my 30% ruling completed in 2018 itself. Please clarify.

As I understand, no one really knows what will happen to 30% of ruling for people who already have that. We have to wait for the government.