Please review fix for [ISSUE #297]