Fix #34 proper response