Fixed #196