rapid scan bug fixing