Added missing guards