added a workaround for z+ dump