* fixed window handling