Fix for latest changes.