Fixed #139