fixing define guards