fixed info-window handling