Fixed issue related to saving optional hard disk