Fixed over-finalization