Fixed #105