unfixed #217 fixed #239