fix underlay & pinhole combination

closes PR 13993