Fixed regex and workarounded multiple consequences calls to on_modified