Fix for itest problem