Adding a wrapper to handle path problems