Need this logging fix in both toResponse() methods