Fix issue 216