Bug fix for adaptor spotting