Fix issue 67