Please review fix for [ISSUE #323]