Fix issue 473