another stab & fix typo