fixing the lemma-spaghetti