Fixed #108