Treat the removal of constness issue reported on fedora