Re-add safeguard