fixing bug with 2.6