Fix issue 36