Fix issue 107