Fixed Issues with beam scan sources