Fix for latest code.