Fix the scan topic issues for now

Closes issue #69