Scanner App Bug fixing