Fixe bug in logic of declare*