Fix code with reversion 1.8.1