Similar multipart fix for visibility data