Fixed #114