Fix issue 127