Another attempt at fixing the tutorials