fix timestamp support