Fix issue 125