Please review fix for [ISSUE #162]