Fix issue 178