may have fixed the two window bug