Hardcode bstr dependency until go to R16