Fix bug on missing timestamps