Another attempt to fix preview loading issue