Fixed #179