Fixed #92