Issuer #137 - Fix. Also, minor refactoring of surrounding (redundant) code.