Fixed -1, added more scans