re fixing bug