Final fix for #1560.