remove the shifting code -- still causes trouble in some cases