fixed marcos errors