ticket:1 Fixed non-global models