Add #15 to the list of scan based fix