Fixed issue on completions based on comments.