Fix issue 222