fixing bug in base