Fix/2.8/rb6999