NSString+Date dupl.
Fix NSString+Date