Scanner bug fixed