Fix on window locationa management