Reset hasCapiProps in right place