bug fixes with the passthrough data