Fix for sample2