Fixed issue #114 and #135

nope it shouldn't because rename is also a syncable change so it needs to be recorded