Active window fix (again)