Most commented fix

Fixes #164