ensure compatibility with 1.6.1.