Added workaround for bug to be removed GH1070
Merge pull request #1071 from psav/fix_pxe_workaround

Added workaround for bug to be removed GH1070