Fix for Pushdown template