Removing extra check in tpl