Fix issue with an embedded get_data call, needs to work slightly differently; for #1441