[PATCH 5/5] Fixed error where char** not being promoted to const