Fix for latest version