Fix issue 130