Fixing comment function