Fixed issue 48504