Fix for SCI-1718