Bug fix in EnterModel