Fixed error with new choices