Fix issue 38