Fix viewer data builder failure