Hw issue 2

This patch is made to address the issue documented here:
https://github.com/HuaweiTech/bosh/issues/2