Regarding the last commit: fixing Uncommenting.