1.6 Release Bug fix.