Fixed #68