Fix proper response issue