Fix bug 1216: Force model deletion