fix possible problem