Fix for bundled binaries