Updated to match hbro v1.1.1.0.