fixed endif's