Fix auto select for disks >= 12 and < 18