Please review fix for [ISSUE #314]