Compatible with reversion 1.8.1