make it easier for bsv compiler

Change-Id: I1a6f5a8421977f7aca2c89df1c99e33ba85e9539