Merge scan code fix

Git seemed to lose track of this one..?