Fix issue 562