fix #954
Merge branch 'fix.954'