Improved disk check