Try to fix windmoves again