Ensure path is backwards compatible with old behavior