Fix for the ADDRESS grep