Fix issue 52