Fix date serializer