Fix where disposed logic is wired up