Better workaround for local file shot