Fix to support 0.4.x Authorization