Fix to SCI-1458