Fix bug for no timestamp specified