macro parsing fix