Fix to SCI-1298