Use better workaround for video preview issue