Fixed handling of binaries