replaced a hardcoded string format
Merge branch 'timestamp-fix' into testing