Fixed #126