Fix for no initial choice