Fixed the problem with no timestamp