some missing commit from improved zoom handling