[3.8] Fix thumbnail access