prob a case of better handling needed in master th...