Workaround for Donato-Zerrillo