Fix issue 161