fixed request handler