Fixed #66