Fix issue 92