Try to add timezone awareness