Fix issue 573