generally working for same-directory files
fixed client conflict