More bug prevent