removed innecesary guard