AESH-264

instead of having your own logic for getting the filename, rather use Resource.resolve(cwd)