More elegant getTimestamp fix