fix #624
Merge branch 'pr625'