fixing a macro mess