Fixed #117