Small tweak to the START/FINISH fix