Fixed bug with ordered choice and epsilon