fix closing handles