manually sync fix from experimental