Trying to fix problem with automatic comments