fix #7 and #10, broken change computations