adapt to changes in master