fix for getting actual ts
Merge commit 'df4f7299381242820763e2878040d716dd275bdf'