Fixed the disks handling issue