Module: view model finalization bug fix