truly fixed exit handler problem