Tempshit has the moving forward bug fix. put it into original