Fix binary data issue