HG-156 fix undefined