Fix issue 176