Fix #403

@garyb Can you please review when you have a second? I don't think this affects any other binder types.