(bug on core-updates, not master)