Fixed #124