Fix issues/82