Fix issue 97