This should fix the extra unneeded timestamp