Fixed choice update