quick fix on timestamp