Fix for scan API