Fix issue 62