Fixed scanner bug