Fix for Build Fail in Scan by key