Fix/2.6/rb6991