Bug for non loading first window fixed