Fixed for latest version.