Fixed #120