Compatible with reversion 1.8.1
Fix code with reversion 1.8.1
Merge pull request #3222 from yakky/feature/fix_reversion_181

Compatible with reversion 1.8.1