Added a guard