Fixing PR #367