Declaration recovery fix