Some fix due to ruby2