fix issue #649
Merge remote-tracking branch 'icoxfog417/issue649'