Fix early dispose