Optimize BUNDLE_PATH to use the same dir