Cherry pick heavy atom fix by hand