Fixed scanners to accept the right message