fix possible disaster