Issue/211 multiple scan