Beginning 1.6.x fix