Fixing Issue #351 formatting with `of`