Modified to maintain compatibility with V1.6.