[fix] #584 #578
Merge pull request #635 from h-2/fix/584_2

[fix] #584 #578