This should fix segfault and remove one-line comments