Fixes #2592 Cont. Attempting to fix boot-disk