Fixed finalize
Merge