Revert "Revert "fix boot properly1""

This reverts commit 2467b7b7a700c078e0432ee81a956214f62a6d1f.