complete bugfix against _has_changed issue