Fixed issue 474