Fixed window name bug