RVM fix
merge