Fixed issue 473