Fixed server hanging on some requests