Updated to match hbro-1.2.0.0