Added some code to resolve the full path