fix
Merge pull request #596 from mindcat/master

fix