(#54) - fix for large buffer values