Master serve fix