fix #636
Merge pull request #637 from bleis-tift/master

fix #636