Resource leak fixed: old Model.hmap elements remained in memory