Fixed timestamp being displayed twice