Fix possible problem