Fixed for using string dates