[#90] Fixed bugs after merging conflict