WIP: Fix direct model updates not working on some cases