Handle finalizer fix missing too...