Add a repro case and fix for binary data through Hermann

The long way around results in more readable/understandable code IMO