Bug fix in request builder