yui model fix v2