Should fix the stringifying issue