Fixed bug when FFing right before a choice