Fix *data argument passing