Fix issue 91