add fix for option click