Fix issue 61