Window Property fix