Merge "Fix BN to use correct size of array"