SMBCAP2647 fix eisbrecher regressions