Handle shorter binaries