buxfix in neilb/