Correct handling of binary data