fix function / macro store check