Fix sub-issue #159 (https://github.com/fenom-template/fenom/issues/159#issuecomment-119112070)
Fix sub-issue #159 (https://github.com/fenom-template/fenom/issues/159#issuecomment-119112070)

Sleuthhound/fenom,vgrish/fenom