Testing timestamp fix