Fixed request handler issue