Model: fix "dirty" even more

Still needed to add special treatment of `false` value
Merge pull request #427 from DarkSide666/patch-5

Model: fix "dirty" even more