... fixed a problem passing the request context. TODO: request is not needed as a param anymore.