Fixed #166