Fix issue #176 and another