Fix for PRD-1841

Added temporary hack for disks