Scanner fixed