Finalizing fix