fix possible issue