Fixed #92 crash