Fix for macro changes