Keep compatible with old versions (1.8)