First potential problem and modification