Fix issue 225