#12: Fixed probleems with comment