try to fix Date representation