windows fix - improvement needed