Extend template wait hack