bugfixed the problem with comments, still untested