Fix issue 77