Issue 20: Fixed response parsing