fixed request handling