fix for raw commands