Fixed more dynamic handling of file path