#164 after review + typo fix