Bonfire sync fix