Fix issue 83