CGIV-1650: possible fix to bad path issues