fixed #9, close #9 (untested)