Issue #22 fix

Replacing '#' with 'No'