Avoiding using those macros (sometimes you can rewrite with forms with better coverage) or ignore the drop is what I've done