PLA-1487 timestamp fix