hrbrmstr fixed #20