More bug preventing