fix up master