bugfix: request handler