-fixing bug