Fixed Model id auto-generate problem