Fix unexpected situations