Fixed bugs with comment