FIX: use short date format for timestamp