Fixed #77