Fixed #169