proper fix for rename, move in and move out directories