add another safeguard