Fix issue 138