Fixing the final choice thing again