CRA-684 Fixed crash when external wavelet was used