removed isScan check