fix gh-505
Merge remote-tracking branch 'origin/fix-gh-505-v2'