Fix for the request map generator