That's another unrelated issue. Let's get this merged, then remove the dirty = true in a different  PR, ok?