Fix bug - uncommented lines 206\207