Fix for removing global $ change.