Passthrough fix