HG-156 fix types