New try on fixing bug