Fixed double-response issue