Fixed #140