Seemed to have fixed firstwindow problems