Important fix in responses