fixed handicap non-removal bug