Fixed #67