Fixed for latest version