Fixed issue with path resolve