added safeguard