fix potential problem to be fixed later