Fix issue 63