Working on scanning bug fix