Fixing boot up process see #7124