SMBCAP-2647 fix eisbrecher regressions