Could break out of loop before master info was being dealt with properly #289