johann2 fixed add/remove callbacks for good