Bugfix comment parsing