Continued work on https://github.com/xaionaro/clsync/issues/30