Fix issue 72