Fix for oauth bug