Fixed Parallel/Choice bug