Fixing model reset issues