Hacky fix for timestamp