More sensible fix for moaidatabufferstream