Fix issue 60