Fixed issue where final choice was improperly recorded