Fixed problem with reseting disabled status in choice