Fix for cli requests