Fixed subst to avoid infinite-loop.