Resolve issue where date is serialized to an array