Fixed bugs due to comments