Fixed issue with 8330415