With new superb (as always) Model code I wrote, issue #6 is now fixed (branch 3.0).